Fix 344743

diff --git a/ChangeLog b/ChangeLog
index 1d5de3cc7070ac830a27e46c22e958f87529c32a..aa7aaadd38bfebbfc5fdbcf92ba79b2526641d2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-14  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkselection.c: Call init_atoms before using atoms
+       in several functions.  (#344743, John Finlay)
+
        * gtk/gtktreeview.c (gtk_tree_view_set_search_position+_func):
        Allow NULL to reset to default.  (#344838, John Finlay)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1d5de3cc7070ac830a27e46c22e958f87529c32a..aa7aaadd38bfebbfc5fdbcf92ba79b2526641d2a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-06-14  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkselection.c: Call init_atoms before using atoms
+       in several functions.  (#344743, John Finlay)
+
        * gtk/gtktreeview.c (gtk_tree_view_set_search_position+_func):
        Allow NULL to reset to default.  (#344838, John Finlay)
 

diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 9670353498055ceca32b4211df844d09d493ff48..a7712ce2135ccc47c087cb1a0f773b0896346b90 100644 (file)
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -1700,6 +1700,9 @@ gtk_targets_include_text (GdkAtom *targets,
 
   /* Keep in sync with gtk_target_list_add_text_targets()
    */
+ 
+  init_atoms ();
+ 
   for (i = 0; i < n_targets; i++)
     {
       if (targets[i] == utf8_atom ||
@@ -1744,6 +1747,8 @@ gtk_targets_include_rich_text (GdkAtom       *targets,
 
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
 
+  init_atoms ();
+
   rich_targets = gtk_text_buffer_get_deserialize_formats (buffer,
                                                           &n_rich_targets);
 
@@ -1930,6 +1935,9 @@ gtk_targets_include_uri (GdkAtom *targets,
 
   /* Keep in sync with gtk_target_list_add_uri_targets()
    */
+
+  init_atoms ();
+
   for (i = 0; i < n_targets; i++)
     {
       if (targets[i] == text_uri_list_atom)